whitespace and comment cleanups