CB-4469 fixed comments per review