Improve command line output