Changes as per Henry G's comments.

Change-Id: Icbff6d5f8b36736ccccf764220ce799e19e52e1e