CS fixes

https://styleci.grahamjcampbell.co.uk/commits/c1d12b1fcbb093062190e9ccb4932520aa51b5d9/diff