Rearrange comment structure