:lipstick: improve CLI