Refactored product