Reorder statements to be more precise about the flow