made requested changes from code review.