Fix some pep8 warnings