Some PEP8 cleanup.