Removed unused imports and formatting