Refactoring to make better use of Akka for event handling