small refactorying