Cleanup + comments
Merge pull request #1 from WRidder/master

Cleanup + comments