Removal of pep8 violations, redux with gentler approach