Refactoring
Merge pull request #1 from liam-m/master

Make everything pretty, courtesy of @liam-m