fixing code review comments.