Refactor simplify