It seems like your code-formatter is changing a lot of whitespace. This really makes it hard to review this code. Could you please change your formatter?