Slight trace refactor