Use public instead of var in classes

Change-Id: I814995a7d696c90dc857b78180c0ee386db457e3