Refactored to remove unused imports