Some ReSharper clean-up