Prettify some code
Merge pull request #16 from cjheath/master

Prettify some code