Use public instead of var in classes

Change-Id: I2006ab2c476b28bdca81622caf8070155b405f63