StyleCop violations fixed