Whitespace and comment cleanups