Minor refactor on RouteMatch