Revert "PEP8 Changes"

This reverts commit b9ce3daac1c37c30dac5c2e63001497895493af0.