Move imports
White-space related fixes
Merge pull request #13952 from s0undt3ch/hotfix/lint

Lint Fixes