Fix pep8 (one line still remains too long, but it's not a big deal)