pep8 fixes
pylint/style fixes.