Use public instead of var in classes

Change-Id: I8dcefe746062324e024bb7a6b6b1979a28ab2ebd