Tidied up CLI output.