Lots of strange formatting changes in this PR, worth keeping these to a minimum if you can.