Use public instead of var in classes

Change-Id: Idda254a1e6f2772b11847073387cc4a482861885