Use public instead of var in classes

Change-Id: I3528868f1e5eb309f2dd47a7ff38addca7b1945e