Use public instead of var in classes

Change-Id: I33b9d7bfcb2e01125898f8a0e2f0625f0dd69e67