Simplify flow block to simple return statement