Rearrange to flow better