Some defactoring, work on GT recipes (thx DreamMaster!)