More refactoring a la ReSharper; increased use of Linq techniqes