Reformated TODO