Improve C# converter