I agree, but currently it is mixed and moving stuff around to much will just make it difficult to read the patch, no?
I prefer to do this incrementally, beautification in a separate ticket once we've verified nothing is broken