add small refactor