PEP-8 conformance improvements - part III

Another round of PEP8 conformance changes to bring everything up to date.