small refacors