Made todo comments consistent