Reformat cli interface