Little bit of code tidying
Merge pull request #2 from briancleland/master

Little bit of code tidying