Opinionated code style and whitespace cleanup.
Merge pull request #1 from jcoleman/style-cleanup

Opinionated code style and whitespace cleanup.