Miscellaneous cleanup.
Prefer 2 spaces over 4 spaces.