Some tidying up
Merge pull request #3 from jsuggs/feature/tidying-up

Some tidying up