Hand edited PEP8 cleanup

Following up on my autopep8 updates, here are some hand updates that the autopep8 couldn't handle automatically.