small refactorng
small refactoring