Minor cleanup and comments
Merge branch 'cleanup-comments' of github.com:bkase/r2d2b2g into bkase-cleanup-comments
fix nits