minor cleanups
Merge pull request #1 from liip/cleanups

minor cleanups