Use public instead of var in classes

Change-Id: I70289070625094aeba93f13f117b3632bed9a876