Use public instead of var in classes

Change-Id: I13fdc0aee200f54c7008e179eb17b3698b9b8f72