Tidying up
Merge pull request #2 from chaosphere2112/patch-1

Tidying up