small refactorung