Use public instead of var in classes

Change-Id: Ia577d19d33592260175dcc484fe1f31a8beae249