ReSharper code cleanup