Merge "Use public instead of var in classes"