Refactor face fixup code