Refactored Coach and Passenger class code