Moving the C# code closer to the org Java code
Formatting code to default VS.NET format