Do some PEP8 cleanup before major changes