tweak comments, whitespace