StyleCop violations fixes