Refactoring, midway