can we cherry pick these coding style commits in another branch? It would reduce the massive size of this diff