Use public instead of var in classes

Change-Id: Ib41899733e6e8ec3cc5889c8cc6739d5be05690c