Improve the command line parameters