Better TODO wording