Use public instead of var in classes

Change-Id: I7272d3e5fcddf9687e4d56f1aa9d5370d5ffe73b