Cleanup and add comments
Merge branch 'develop' of https://github.com/golems/grip2 into develop