Use public instead of var in classes

Change-Id: Ic92dc1938e76dcac9c559da52b110f2b6586e275