some improvement on vehicle code