whitespace/comment/wrap fixes, no intended functionality change