Use public instead of var in classes

Change-Id: I9d71150d7cdce9cceffed4b573d1024362b01ecf