Fixed most of the PEP 8 style variances.
Remaining PEP 8 style variances.