Did a blanket PEP8 cleanup.