Cleaned up formatting
Merge pull request #1 from markchadwick/master

Cleaned up formatting