Continue improving PEP8 conformance