Okay - lets make this deal, leave these lines as they are, and submit a PR for the rest of your style stuff. Then raise a second PR for these changes, so that way we can merge in the other stuff that is fairly straight-forward and debate this separately. Sound fair?