Improve CLI report