Style fixes

You can just cherry-pick what you want to keep out of these commits.