Code simplication following code review.