Use public instead of var in classes

Change-Id: I8dc5f26793e81aabca7509422bae1c8bfbf8a499