reduce number of trace + refactoring of make