Adjustments to cli to provide a simpler report
Minor cleanup