Refactored recipes to use repository, some minor fixes