Refactoring: Make RoutingHandler more scala idiomatic