Tidy up
Merge pull request #1 from mikefrancis/patch-1

Tidy up