whitespace/comment/wrap fixes, no intended functionality change
Merge pull request #850 from sgraham/ocd

whitespace/comment/wrap fixes, no intended functionality change