Please avoid gratuitously reformatting existing code in a pull request, as it makes the diff too long and increases the risk that the PR will not be mergeable.