Use public instead of var in classes

Change-Id: I4a7c74f86ceee1b0eba43546fea850e290a85b9e