Simplify the flow