Remove unused imports, fix indent