B-58092 fixing pull request comments