Resolve StyleCop issues