Code cleanup [ci skip]