CLOUDIFY-2222 minor refactoring