Use public instead of var in classes

Change-Id: I561332b236d0e11ac5c7752b5f6b411baa5fcd18