More pep8 fixes - 125 left