Use public instead of var in classes

Change-Id: I709dd59e4d9490338ac1b1f4a177325c982b2c8c