Making the CLI outputs consistent