Refactor RouteDistinguisherUtil