diff --git a/src/modules/moduleList.f95 b/src/modules/moduleList.f95
index b11ed36..0abdd5a 100644
--- a/src/modules/moduleList.f95
+++ b/src/modules/moduleList.f95
@@ -10,7 +10,7 @@ MODULE moduleList
   END TYPE lNode
 
   TYPE listNode
-    INTEGER:: amount = 0
+    INTEGER:: amount = 0!TODO: Make private
     TYPE(lNode),POINTER:: head => NULL()
     TYPE(lNode),POINTER:: tail => NULL()
     CONTAINS
@@ -35,7 +35,7 @@ MODULE moduleList
 
       ALLOCATE(temp)
       temp%part => part
-      NULLIFY(temp%next)
+      temp%next => NULL()
       self%amount = self%amount + 1
       IF (.NOT. ASSOCIATED(self%head)) THEN
         !First element
@@ -44,7 +44,7 @@ MODULE moduleList
       ELSE
         !Append element
         self%tail%next => temp
-        self%tail => temp
+        self%tail      => temp
       END IF
 
     END SUBROUTINE addToList