pep8 fixes
pylint fixes