StyleCop Errors Fix