Citi to rework commodities unit as part of consent order work