idempotent tweaks to comments and spacing per smbarne