Resolve all PEP8 violations.

Pep8 & general cleanup