StyleCop refactoring