Cleaned up ViewVehicle