Improve command line use