Command line output improved