small refactoring

still wip