Use public instead of var in classes

Change-Id: I5bdcecbf07a7e1aa8691320b607410faebf012c0