ReSharper code improvements