Code cleanup
Fix any vehicle