Some StyleCop refactoring