Better TODO comment