small refactroring