address code review comments.