I don't like that you did so many whitespace changes. Our coding style might not be perfect but it's not the topic of this PR to be changing that.