ReSharper changes

Ran ReSharper on the solution and made some changes.