small refactori