Use public instead of var in classes

Change-Id: I54f3dbb1c11c525dc973619894bc6a4bb48b3c64