Revert "Fix some PEP8 errors"

This reverts commit 45ef6a2dcf10a3cecdf33f2aa2d6a4afb5c851a1.