further style changes

(one file held back to avoid merge conflicts with chris, will be added tomorrow)