CLOUD-105 fixed review issues and bug