CLOUDIFY-2073 Code Cleanup. CR comments