Refactoring vanilla