PEP8 Style fixes

More changes to fix style errors.