CLOUDIFY-2525 clean code