minor code cleanups

more coming.
Merge pull request #179 from virgil/patch-8

minor code cleanups