Reformatting the source code and extracting a couple of constants is not really “rationalizing” anything. :) If anything, reformatting should have been a separate commit before you changed any code. And, well, as said, if you already change the code, just fix it while you're at it. It doesn’t necessarily have to happen in the same commit. :)