Normalized indentations from 0 or 2 spaces to 4 spaces.

Also bye to trailing newlines.