More pep8 compliance

Fix some lines with 80+ chars.