After refactoring