Polish and clean-up
Merge pull request #34 from andrewhayward/30-cleanup

Polish and clean-up