Making some comments more orderly