Rearrange less variables