Improve CLI user experience