Use public instead of var in classes

Change-Id: Ide9e19a3a02217e406f0fbf821f6596a0ff4b4c1