code cleanup [skip ci]