Refactor and Tidy Passenger