Completed all changes from review.