Apply Black formatting to code

[MarkHedleyJones]

The code formatting is a mess.
Best to apply something like Black under the default settings so there is no ambiguity about how things should be formatted.