Fixed the poor formatting of a lot of the code
Merge pull request #73 from amdziuk/Formatting

Fixed the poor formatting of a lot of the code