Use public instead of var in classes

Change-Id: I534ba7c818bfae1bf7248b4f30b86ccd7fdca6eb