Using foreach instead of map when dealing with an Option[EventBus]. Made the uses of Option[EventBus] more "functional" which results in less code.