Further cleanup post code review.
Further cleanup post code review.