refactoring phase complete