Made some fixes to Class2.cs