Stylecop fixes
Merge branch 'Stylecop-Fixes'