and even more pep8 warning fixes