Cleaned Up Vehicle Code