Use public instead of var in classes

Change-Id: Ifd2712af2168c451b494d2c3d112c4e00ece43e0