Use public instead of var in classes

Change-Id: Iccc0ed201603f6df718b505ce79617d64af249dd