Refactored face