After refactoring by using extract methods and extract class