refactoring of AngularFaces