Improved command line usage