Refactor start_streaming