CLOUD-141 fixed review commentss