Why!? I'm not going to make you fix before merging since I've had a long opportunity to review earlier, but there's a bunch of places where you change good pep8 whitespace to some arbitrary different thing for no reason