made requested code review changes.