some cleanup
Merge pull request #10 from stefanpenner/cleanup

some cleanup