Refactoring-p1