Use public instead of var in classes

Change-Id: I84b554884aaa53d11e4992517e6c15bd4cb682a1