cleaner and fix typo