Do not reformat code that is relavant for your pull request. Please revert these changes. See also the changes below.