All PEP fixes except for 79 character line limit

There's some refactoring to be done there so I omitted the change.