fix typo and some clean up