Clarity and another todo