More Autopep8 changes

Since you're interested, here are more. There are still a bunch more that I'm going through...