Reorganize imports
Normalize whitespace