Partial refactoring a la ReSharper suggestions