Cleanup

Add comments and TODO
Merge pull request #1 from SmallJoker/master

Cleanup