Rearrange stuff a bit