a bit of cleanup
Merge pull request #20 from mreiferson/cleanup_20

many thanks @mreiferson !