Resharper warning cleanup