Further PEP8 Fixes

Trying to set everything to PEP8