switch to refactoring for simplify