Refactored vehicle to object