Use public instead of var in classes

Change-Id: I21602a7e4a3ceb9bd9e2a84aff4b68100ff46ff5