Added code review comments.