More Resharper cleaning