Cleanup
Merge pull request #239 from remear/cleanup

Cleanup