Small fixes, cleanup

Tiny changes.
Merge pull request #1 from mixonic/patch-1

Small fixes, cleanup