Use public instead of var in classes

Change-Id: I6da5c25e0dfd86ca4af98b4d65032b3c15555afb