Improve cli user feedback