More output cleanup