simple refactoring

do some names actually