Code updates based on review.