A bit of clean up of the vehicle operation code