Stylecop fix

Fix StyleCop warnings
Please revert this revert.