Some code clean up
WIP: Multi Line command write outs