Whitespace and formatting cleanup
Merge pull request #25 from ccschmitz/cleanup

Whitespace and formatting cleanup