Code tidy up
Merge pull request #17 from ldjagger/master

Code tidy up