Rearrange some things