Make command line inputs more explicit