Rearrange a few things