Fix imports and whitespace