Make pep8 happy, except for the long lines