Use public instead of var in classes

Change-Id: I60612bb3917e24115f7dd3160c6a98f7b8193efa