Minor cleanup [ci skip]