Use public instead of var in classes

Change-Id: I888ec06fc2f1fe72b217b861f9073dc09d7285f5