Use public instead of var in classes

Change-Id: Ie6c7d64d51a54ec50a03767ff9d1148edbe65343