refactoring

small refactoring