StyleCop issues fixed