Yeah theres lots of PEP8 fixes in this file and I don't like to let pycharm just go wild when it does PEP8 changes. I'll go through this tonight.