Rearrange stuff so it makes more sense