CLOUDIFY-2380 pep8 compliant