Cleanup
Merge pull request #74 from GrahamCampbell/cleanup

Cleanup