Comments + removed TraceKit.wrap