last of the important and easy pylint/pep8 warnings fixed.