Address feedback in PR