Object Refactoring Complete