Cleaned up some code, formatted output now appears properly
Merge pull request #7 from jammm/master

Cleaned up some code, formatted output now appears properly