Tidy up

[ci skip]