Code reformat, no functionality change.
Pair equal cleaning.
More cosmetic changes