Adress PR's comments