Minor fix (2)
Cleaned the Vehicle classes.