solve clacote comments on PR