cleanup and fix typo