Iteration after code review.