PEP8, and some more cleanup.