refactoring(2)