Merge "Fix pep8 violations in config_cleanup"