Remove unused imports and fix indentation