Incorporate PR review feedback