Fix whitespace and imports