Use public instead of var in classes

Change-Id: I5e2009fa25f4d85cba68567ff8c1ae70467bf02d