update tadue based on learnings from checken: mostly style adjustments plus a few simplifications