Code style tidy

This is just an automatic code style tidy-up for files I'm about to change in some other work. I've made them a separate PR to make both merges more simple.