Use public instead of var in classes

Change-Id: I99738476d10491e9207737d5e17a6e75ab328511