pep8

There are several lines that are too long still. I'm fine with that.