WIP minor tidy
[ci skip]