Use public instead of var in classes

Change-Id: I99174cfce792dcd5bc22134950de7303b11fd0ea