Refactoring for stylecop compliance