PEP-8 conformance improvements

Updates to make master branch pep8 clean once again.