Fix a few Pep8 warnings