cli formatting cleanup