Use public instead of var in classes

Change-Id: I0e80f737f519e8384dfac2dde7b0ebbe158ca9fb