More resharper refactoring