First pass of PEP-8 fixes.