Faces and refactoring