implement Davi's review suggestions (post-push fixes)
Attach a file by drag & drop or click to upload
