Cleanup of comments and little code
Merge pull request #26 from Nikerabbit/master

Cleanups