Refactoring for PrimeTime