improve CLI