Oliver Elphick. A few other minor cleanups while at it.
Attach a file by drag & drop or click to upload
