Code cleanup activity #472