Use public instead of var in classes

Change-Id: I10610d88c258914492ea1e704013ec76e291a4f0