StyleCop recommendation changes

StyleCop recommendation changes