diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90
index f02d7bc92..e98631fe4 100644
--- a/src/commercialFEM_fileList.f90
+++ b/src/commercialFEM_fileList.f90
@@ -28,8 +28,6 @@
 #include "lattice.f90"
 #include "constitutive.f90"
 #include "constitutive_plastic.f90"
-#include "constitutive_damage.f90"
-#include "constitutive_thermal.f90"
 #include "constitutive_plastic_none.f90"
 #include "constitutive_plastic_isotropic.f90"
 #include "constitutive_plastic_phenopowerlaw.f90"
@@ -37,15 +35,17 @@
 #include "constitutive_plastic_dislotwin.f90"
 #include "constitutive_plastic_disloUCLA.f90"
 #include "constitutive_plastic_nonlocal.f90"
+#include "constitutive_thermal.f90"
 #include "source_thermal_dissipation.f90"
 #include "source_thermal_externalheat.f90"
+#include "kinematics_thermal_expansion.f90"
+#include "constitutive_damage.f90"
 #include "source_damage_isoBrittle.f90"
 #include "source_damage_isoDuctile.f90"
 #include "source_damage_anisoBrittle.f90"
 #include "source_damage_anisoDuctile.f90"
 #include "kinematics_cleavage_opening.f90"
 #include "kinematics_slipplane_opening.f90"
-#include "kinematics_thermal_expansion.f90"
 #include "crystallite.f90"
 #include "thermal_isothermal.f90"
 #include "thermal_adiabatic.f90"
diff --git a/src/constitutive.f90 b/src/constitutive.f90
index abff6e21d..2d60f7e66 100644
--- a/src/constitutive.f90
+++ b/src/constitutive.f90
@@ -368,8 +368,7 @@ subroutine constitutive_init
   debugConstitutive%ip         =  debug_root%get_asInt('integrationpoint',defaultVal = 1) 
   debugConstitutive%grain      =  debug_root%get_asInt('grain',defaultVal = 1)
 
-!--------------------------------------------------------------------------------------------------
-! initialized plasticity
+
   call plastic_init
   call damage_init
   call thermal_init
@@ -386,8 +385,7 @@ subroutine constitutive_init
       sourceState(ph)%p(s)%partionedState0 = sourceState(ph)%p(s)%state0
       sourceState(ph)%p(s)%state           = sourceState(ph)%p(s)%partionedState0
     end forall
-!--------------------------------------------------------------------------------------------------
-! determine max size of source state
+
     constitutive_source_maxSizeDotState   = max(constitutive_source_maxSizeDotState, &
                                                 maxval(sourceState(ph)%p%sizeDotState))
   enddo PhaseLoop2
@@ -401,12 +399,12 @@ end subroutine constitutive_init
 !--------------------------------------------------------------------------------------------------
 function constitutive_homogenizedC(ipc,ip,el)
 
-  real(pReal) , dimension(6,6) :: &
+  real(pReal), dimension(6,6) :: &
     constitutive_homogenizedC
   integer,      intent(in)     :: &
-    ipc, & 
-    ip, &
-    el
+    ipc, &                                                                                          !< component-ID of integration point
+    ip, &                                                                                           !< integration point
+    el                                                                                              !< element
 
   plasticityType: select case (phase_plasticity(material_phaseAt(ipc,el)))
     case (PLASTICITY_DISLOTWIN_ID) plasticityType
@@ -628,9 +626,9 @@ function constitutive_collectDotState(S, FArray, Fi, FpArray, subdt, ipc, ip, el
   real(pReal),              dimension(3,3) :: &
     Mp
   integer :: &
-    ho, &
-    tme, &
-    i, &
+    ho, &                                                                                           !< homogenization
+    tme, &                                                                                          !< thermal member position
+    i, &                                                                                            !< counter in source loop
     instance
   logical :: broken
 
@@ -685,7 +683,6 @@ function constitutive_collectDotState(S, FArray, Fi, FpArray, subdt, ipc, ip, el
 
   enddo SourceLoop
 
-
 end function constitutive_collectDotState
 
 
diff --git a/src/constitutive_plastic.f90 b/src/constitutive_plastic.f90
index f62bca60e..acd9d5a67 100644
--- a/src/constitutive_plastic.f90
+++ b/src/constitutive_plastic.f90
@@ -175,12 +175,10 @@ contains
 
 
 !--------------------------------------------------------------------------------------------------
-!> @brief allocates arrays pointing to array of the various constitutive modules
+!> @brief Initialize constitutive models for plasticity
 !--------------------------------------------------------------------------------------------------
 module subroutine plastic_init
 
-!--------------------------------------------------------------------------------------------------
-! initialized plasticity
   if (any(phase_plasticity == PLASTICITY_NONE_ID))          call plastic_none_init
   if (any(phase_plasticity == PLASTICITY_ISOTROPIC_ID))     call plastic_isotropic_init
   if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call plastic_phenopowerlaw_init