Use public instead of var in classes

Change-Id: Id2c909a04e87eb0d4fcad5d0c7fb452cabe859a4