Rearrange info so it's more organized