StyleCope refactoring.