rearrange comments