I agree that doing this piece by piece creates a lot of noise without really fixing anything. If this was done in a single step with a broader change this would probably be worth a little bit more.