Quite a few micro cleanups, code should be simpler to follow.
Attach a file by drag & drop or click to upload
