UserAndTripCheck Refactor