After Refactoring