Personage + refactoring