Applying ReSharper recommendations across the project
Add EC
Remove debug lines