Use public instead of var in classes

Change-Id: I0f28f663eba42025d072f010b5c5722b48cbeb77