Refactored passenger and driver structure