More cleanup
Merge pull request #35 from Orvid/master

More cleanup