Use public instead of var in classes

Change-Id: I351e0b776497b9cfa9914400048e5ea9f00b5aac