Improve the trace output