Formatted all files to match Template
Merge pull request #2625 from ten24/feature-dependencyInjectionCleanup

Formatted all files to match Template