ReSharper clean-up