Refactor PR