Use public instead of var in classes

Change-Id: I54557502a6e9440da043000d8b1515b99ca885b9