Merge "Clean up: Declare variables with public instead of var"