Use public instead of var in classes

Change-Id: I8b377f43ff149e28a1840d886caff80f06bc63ba