simplifier

Simplify code and workflows without behavior changes; reduce complexity and duplication; improve rea