Contributions from closed source development

[Fermain]

This is another messy PR containing a lot of whitespace changes from linting mixed in with some meaningful changes. It's all been well tested in production ;)