[#80305450] a little polish

just tweaking some stuff and adjusting
command generator to output
the proper structure of a cf command