Improves StyleCop compliance