small refactor
small refactor