Refactoring TheEnd