Use public instead of var in classes

Change-Id: I6bc2196d7ef5411300178493deff7d44f9737a96