More PEP8/80-char changes. I'm using a terminal... :(