Use public instead of var in classes

Change-Id: I013485bf6cf58ef574a8a4b48155fe8b10065850