VID-1778 Cli formatting