Reworked PEP8 compliance

I've reworked changes for PEP8 compliance throughout, excluding tests. This should build cleanly and the following should return no errors or warnings:

```
flake8 --ignore=E501 --exclude=tests*
```