big PEP8 cleanup.