Use public instead of var in classes

Change-Id: I7699285b4d7b060d86160593789b18e6ca81bcc7