Use public instead of var in classes

Change-Id: I30e031cf046637cd1cb894c2e3e37555f947cbd0