cli improvement