Recipes refactor