Use public instead of var in classes

Change-Id: I0517cac65c0999aa26a2a694f6241277f79bfab9