Removed magic keywords from ToDo.