apply ReSharper suggested changes