refactoring

1 job for fix/new_streams in 47 seconds (queued for 7 seconds)