Error with cleavage state not being preserved and resharper cleanup
Performing Resharper cleanups