Lot of resharper clean up.