Tidy up of the codebase
Merge pull request #96 from janm399/tidyup

Tidy up of the codebase