pep8 and pylint fixes
More pep8 fixes