Clean up whitespace, comment lines, and imports