Wendy refactoring