Improvements to CLI output