First Refactoring Phase