autopep8 runthrough and janitorial changes.