Removed unused imports and formatted code