Merge pull request #1 from durandal42/master

Cleanup / learning how pull requests work.
Consistent formatting.