Massive Code Refactoring

Using ReSharper