code review comments change.