Fix comments, imports, and whitespace