Start refactoring Vehicles