small cleanups
Merge pull request #433 from martinpovolny/cleanups

small cleanups