FaceList: some refactoring