Fix PEP-8 E201, W293, E303
Fix PEP-8 E261. Remove unneeded comma
Fix PEP-8 E302
Fix PEP-8 W291
Merge pull request #7578 from s0undt3ch/hotfix/lint

Some PEP8 Lint fixes