Code review.Several method comments are added.