Cleaned up the CLI output a bit