Resharper clean up

Many small refractors due to application of Resharper