Use public instead of var in classes

Change-Id: I24c213fa15b6dec5e2950c1a7a8ed83e6689e3b5