Refactors make_tracer