Some more Lint and formatting fixes
Merge pull request #9084 from s0undt3ch/develop

Some more Lint and formatting fixes