fix typo and cleanup