pep8 fixes (thanks @jerith)