comments, cleanup, and style
Merge remote-tracking branch 'upstream/master'