realign, rearrange, clean up output in general  #3371