Various pep8 fixes