#131: consistent spacing and comments

Resolves #131.