PEP-8 changes and various cleanup.