Further PEP8 changes.

Should be basically PEP-8 compliant now.