Use public instead of var in classes

Change-Id: I23bc13d8aa741c2796a4f5af81cc6c99ca75af20