Minor clean for the archetype