ReSharper cleanup