PEP 8 tweaks, some additional cleanup.