fix typo and re-order