Use public instead of var in classes

Change-Id: I0f532925cdf958f25912afcb2d092e232d71c5bc