a bit of cleanup
Merge pull request #577 from nelenkov/dev

a bit of cleanup