Beginning of StyleCop refactoring.