Use public instead of var in classes

Change-Id: I6c34c0f15c9759e9e2b04fd6da93e5c577a40ce5