Refactoring and fix typo

why do you changed this?