Whitespace fixes and comment changes.