Use public instead of var in classes

Change-Id: Ied5bea50b665d4c6d605455c6d3bb3203ed03c63