Phoebe refactoring