Whitespace and formatting cleanup
Merge pull request #18 from davidfischer/formatting-cleanup

Whitespace and formatting cleanup