small refactorinigs