Some changes to files using Resharper suggestions.