Improved command line output