Re-written TODO comments