hopefully clean up/simplify vehicle input