Clean up unused imports and indentation