MBH: output cleanup