StyleCop refactoring.