Cleanup from review.