Cleaned some more stuff
Merge pull request #41 from telehash/cleanup

Cleaned some more stuff