Refactor PR

Refactor complete