Comment and rearrange