adjustments after code review.