StyleCop warnings fixed