Improve CLI program