Fix whitespace and line length