small refactoring
small refactoring