Refactoring, again