This new lines added here and there along the patch are not really part of the patch. You should put all the changes to the style of the code in a separate commit at least. 

Also in general I don't think we add a new line after the copyright.