Made todo comments more uniform.