fix code review comments.