Refactor phase...