fix typo, clean up a bit