minor cleanups accumulated while reading the code
Merge pull request #14 from lrytz/cleanups

minor cleanups accumulated while reading the code