Rearrange comment