mostly reformatting
Merge branch 'nick'