More resharper refactoring.