address review's comments