Refactoring Faces generator.