Use public instead of var in classes

Change-Id: Ic7b0455a4759579ef85b3c18bac55fb4f0e07183