Use public instead of var in classes

Change-Id: I2e995516879d72a09224a002a61e3bc2f26c8e3a