Clean up vehicle code, better names for schemas