equivalence refactoring complete