small refactorign