vol2: Code cleanup C#