Use public instead of var in classes

Change-Id: I51e5f093d5427603eca984578f4ef0e86d8765b1