Use public instead of var in classes

Change-Id: I17585f0dbfca793e757ee0c04e5dac0ae5f6f072