Refactoring(6)