Minor cleanup of print outs