Code cleanup [skip-ci]