More progress on refactoring for PEP8