Use public instead of var in classes

Change-Id: I7176f4bd2db09fd5b40668d6683431a46e8db365