pep8 error line too big. Perhaps address all these issues together in one PR