Use public instead of var in classes

Change-Id: I689c798003e9ac120e7b157fd9265a9cac23b0d8