Dramatica refactoring