Using foreach instead of map when dealing with an Option[EventBus]. Made...

Based on comments in #229 I changed from using ```map``` to ```foreach``` when dealing with an ```Option[EventBus]```. I found another place in the code that was using ```map``` and also changed that to a ```foreach```. Lastly, I made some additional small "functional" changes where an ```Option[EventBus]``` was used.