Improved TODO note