Finetuning of the comments in the TODO