ReSharper changes

Ran ReSharper and made some changes.