PEP 8 cleanup

I did some PEP 8 cleanup. I also ran the unit tests to make sure all the tests still passed.