-small refactor