misc whitespace cleanup and comment clarifications