Cleaned up vehicle model functions