Whitespace and comment updates