Refactor in PhaseList