General code cleanup
Merge pull request #139 from philwareham/gh-pages

General code format cleanup