Use public instead of var in classes

Change-Id: I74f2777a77e5f2efecd0ac7068d5886321f29527