Improve commenting, conform to project style for use of ++ etc. No functional changes.
Attach a file by drag & drop or click to upload
