fix typo, re-arrange