small refact
small refact