Refactoring End