Also, trim some comments and avoid an unused-variable warning.
Attach a file by drag & drop or click to upload