improve CLI program