Major Resharper Refactoring