small refactoring
refactor