PEP-8 conformance improvements - part III

Another round of changes to bring everything up to date and valid according to pep8.py