Refactoring (cleanup code smell)