Changes per feedback and code review.