Refactoring EventStream and EventBus