Update whitespace and comments