CLOUDIFY-2335 fix some pep8 stuff