Rearrange comments