ReSharper cleanups