Simplify flow