Remove trailing white-space
Fix missing line lint issue
Fix indentation
Remove extra space
Don't hard code paths
Remove trailing white-sapce
Fix variable name
Merge pull request #13269 from s0undt3ch/hotfix/lint

Lint fixes + no hardcoded paths