Use public instead of var in classes

Change-Id: I35812c90794c027ff11bccfc07e8c013f90ebd89