Use public instead of var in classes

Change-Id: I1f920b0e25e601c81ad310b1693204e7039ebafc