Change: merge Passenger/Driver & some refactoring