Some cleanup
Merge pull request #33 from mcanevet/fix/cleanup

Some cleanup