cosmetic changes to cli.*