small refactor in RouteResolver