The refactor should be minimal