Fix whitespace and comments