Cleanup
Merge pull request #6 from davetoxa/cleanup

Cleanup