Tidied up command line and output