Refactor in recipe-2