Whitespace and comment changes