Refactor to allow coming reuse of the request for stop trip