Fix more pep8 stuff