small consistency stuff as I read.
Merge pull request #22 from stefanpenner/cleanup

small consistency stuff as I read.