CLOUD-106 reapply code reivew changes