More formatting and style changes
Merge pull request #3 from brandonw/master

Aren't I just a style nazi??