Add various pep8 fixes