fix whitespace and comments