Tweak comments, whitespace, etc.