Refactoring Completed