* composite polish * Cleanup Condition Handling * Refactor ConditionTraceWriter * pr feedback * cleanup