some more output cleanup