Cleanup
Merge pull request #20 from jgn/jn-cleanup

Cleanup