Reagent refactor