Clean-up and refactoring of recipe files