Minor clean-up and renames
Merge pull request #4 from matthew-woolley/master

Minor clean-up and renames