Use public instead of var in classes

Change-Id: I6c58d8b2f818900b0dc8cd2717523b98505640d0