Spacing indentation

[timsb]

This is mostly whitespace changes although the diff looks much bigger than that.

Please check through though to make sure I've not made any mistakes