Some cleanups

output format