better wording. removing last remaining 'todo's