Fix PEP-8 E302
Fix PEP-8 E302
Fix PyLink E1120 introduced in d3852568
Fix PyLink C0103
Merge pull request #7608 from s0undt3ch/hotfix/lint

Some PEP8/Pylint fixes