Style fixes should be split out into a separate commit.  Commits that mix functional changes and style changes are generally confusing to read.