Use public instead of var in classes

Change-Id: I9a3aaf4295c4302166b1d5b70e472a493fc70e52