Use public instead of var in classes

Change-Id: I560a1dbb746a701caf78b99c8580c4354a84da85