Refactoring with StyleCop