refractored Passenger