[FOLD] Simplify logic