refactor
change naming
fix typo