Revert "PEP8"

This reverts commit e3fba214f802cafa1ab09eedd83576319b635642.
Revert "Revert "PEP8""

This reverts commit 3d48f0b489b4bb0fa818be6530e36b4b71f93289.