small refact