Improve command line usage