Add some comments suggested in code review.