StyleCop warnings - all done

StyleCop warnings - all done