Refactor StreamingEventType