Use public instead of var in classes

Change-Id: Icda9c3afb8fcbd94b60e778886232be49ec5618b