CLOUDIFY-1927 address code review comments