cleanup + tests
Merge pull request #12 from gorsuch/cleanup

cleanup + tests