DRACI: Rework formatting of gplCommands