Update code with changes after different reviews.