change / rearrange comments