diff --git a/ANN_Model.py b/ANN_Model.py
index ab25ee9e93b9eb03d565f33f53e43ed52ae675f4..15685ba2ae9af93e80a14a53c80f6d0f1e3257e8 100644
--- a/ANN_Model.py
+++ b/ANN_Model.py
@@ -2,9 +2,6 @@
 """
 @author: Laura C. Kühle, Soraya Terrab (sorayaterrab)
 
-TODO: Combine all ThreeLayerNet classes in one class -> Done
-TODO: Change naming temporarily for consistency with older models -> Done (later)
-
 INFO: /home/laura/anaconda3/lib/python3.7/site-packages/torch/nn/modules
 
 """
diff --git a/ANN_Training.py b/ANN_Training.py
index 1297d9fead4ef58810099bf090e18aa619bc79a2..4c471ec4df31f500dc5cdc991790094695bab1eb 100644
--- a/ANN_Training.py
+++ b/ANN_Training.py
@@ -3,15 +3,9 @@
 @author: Laura C. Kühle, Soraya Terrab (sorayaterrab)
 
 TODO: Improve 'epoch_training()'
-TODO: Improve 'save_model()' -> Done
 TODO: Add ANN testing from Soraya
 TODO: Add ANN classification from Soraya
-TODO: Add option to change directory for model saving -> Done
-TODO: Fix parameter bug -> Done
-TODO: Improve naming of training data
-TODO: Rename 'Artificial_Neural_Network' -> Done
-TODO: Rename 'ANN_Training_Data_Generator' -> Done
-TODO: Improve naming for trained model -> Done
+TODO: Improve naming of training data (maybe different folders?)
 
 """
 import numpy as np
diff --git a/DG_Approximation.py b/DG_Approximation.py
index 56edebd278a47d3036fc72724e9309aa4d50cfca..11fadba93d41a46def9b0ea9b2642c685fe5c437 100644
--- a/DG_Approximation.py
+++ b/DG_Approximation.py
@@ -8,6 +8,7 @@ TODO: Replace loops with list comprehension if feasible
 TODO: Write documentation for all methods
 TODO: Contemplate how to make shock tubes comparable
 TODO: Check whether 'projection' is always a np.array()
+TODO: Check whether all instance variables sensible
 
 """
 import numpy as np
diff --git a/Troubled_Cell_Detector.py b/Troubled_Cell_Detector.py
index a3d1002be90a21e97dcc1552b9d79800bf34025e..521629a79c082d831586c6ca504530f61ba25073 100644
--- a/Troubled_Cell_Detector.py
+++ b/Troubled_Cell_Detector.py
@@ -3,7 +3,6 @@
 @author: Laura C. Kühle, Soraya Terrab (sorayaterrab)
 
 TODO: Fix cell averages and reconstructions to create data with an x-point stencil
-TODO: Fix bug for ANN model initialization -> Done (later)
 
 """
 import os