Fix white-space related lint issues
Merge pull request #10285 from s0undt3ch/hotfix/lint-and-formatting

Fix white-space related lint issues