ReSharper Update

Lots of small improvements across all files using ReSharper