Clean it up a bit more

[ci skip]