fixing PR comments