Small refactors to improve schedule equivalence job after code review