Polishing comments

Header comments are almost entirely polished, but outside of comments
nothing is altered.