Use public instead of var in classes

Change-Id: I7cf5e312e7bf2bfd42795277524fc2327ab41ad0