cli: new options and arguments formatting