Refactoring Phase