Use public instead of var in classes

Change-Id: Ib107857b6cebe503277f0d1e3fb31cee8d7e41e9