rearrange some comments