face selection refactoring