minor: cleanup by abstracting the trace messages