More ReSharper clean up