Use public instead of var in classes

Change-Id: Ib91480ec794ac4d1417071274b60d751747d1b82