Refactor yummy into services