Refactored spicy