Use public instead of var in classes

Change-Id: I6d39dec20e6d35548594d56eebcbffbafa3ba4ba