StyleCop code quality fixing