Cleaning up a bit

[ci skip]