and make the local field protected->private, because nothing
else needs to access them.

Change-Id: I4411b98cacb06f3e80a7ab2108917b497dc63625