C# improvements #2