Use public instead of var in classes

Change-Id: Iff61883aae53dc76ff90b0a8dc87012c52f98bf5