small refactoring
add stream