Changes per recommendations in PR