Use public instead of var in classes

Change-Id: I73d6ab5742432be7ab27db9db0f5a25d15ad6a2f