Revert "PEP 8 formatting changes"

This reverts commit 8f340d116f0971b16656841e03694b605df984b2.