done refactoring extract method.