minor cleanups
Merge pull request #77 from jackalope/cleanups

minor cleanups