Use public instead of var in classes

Change-Id: Ifbf810cf49bbd106623ceb8aadedfb59148ea5b2