diff --git a/src/CPFEM.f90 b/src/CPFEM.f90
index fce375259..58beb72a0 100644
--- a/src/CPFEM.f90
+++ b/src/CPFEM.f90
@@ -140,7 +140,6 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS
   num_commercialFEM => numerics_root%get('commercialFEM',defaultVal=emptyDict)
   iJacoStiffness = num_commercialFEM%get_asInt('ijacostiffness',defaultVal=1)
   if (iJacoStiffness < 1)  call IO_error(301,ext_msg='iJacoStiffness')
-!------------------------------------------------------------------------------
 
   elCP = mesh_FEM2DAMASK_elem(elFE)
 
diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90
index 2b56ba946..8850a62fc 100644
--- a/src/YAML_parse.f90
+++ b/src/YAML_parse.f90
@@ -51,7 +51,7 @@ recursive function parse_flow(flow_string,defaultVal) result(node)
   if (len_trim(flow_string) == 0 .and. present(defaultVal)) then
     node => defaultVal
     return
-  elseif (flow_string(1:1) == '{') then                                                                 ! start of a dictionary
+  elseif (flow_string(1:1) == '{') then                                                             ! start of a dictionary
     e = 1
     allocate(tDict::node)
     do while (e < len_trim(flow_string))
diff --git a/src/YAML_types.f90 b/src/YAML_types.f90
index 6a2706269..ad3db9d47 100644
--- a/src/YAML_types.f90
+++ b/src/YAML_types.f90
@@ -155,9 +155,9 @@ module YAML_types
     final :: tItem_finalize
   end type tItem
 
-  type(tDict), target,public :: &
+  type(tDict), target, public :: &
     emptyDict
-  type(tList), target,public :: &
+  type(tList), target, public :: &
     emptyList
   
   abstract interface
diff --git a/src/crystallite.f90 b/src/crystallite.f90
index eb10e8550..9113fa12f 100644
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@@ -129,7 +129,7 @@ subroutine crystallite_init
     eMax, &                                                                                         !< maximum number of elements
     myNcomponents                                                                                   !< number of components at current IP
   
-  class(tNode) , pointer :: &
+  class(tNode), pointer :: &
     num_crystallite
   write(6,'(/,a)')   ' <<<+-  crystallite init  -+>>>'
 
diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90
index f09759009..cc9d3dd65 100644
--- a/src/grid/spectral_utilities.f90
+++ b/src/grid/spectral_utilities.f90
@@ -191,7 +191,7 @@ subroutine spectral_utilities_init
     tensorSize = 9_C_INTPTR_T
   character(len=pStringLen) :: &
     petsc_options
-  class (tNode) , pointer :: &
+  class(tNode), pointer :: &
     num_grid
 
   write(6,'(/,a)') ' <<<+-  spectral_utilities init  -+>>>'
diff --git a/src/numerics.f90 b/src/numerics.f90
index b4d029d00..bb861a6d0 100644
--- a/src/numerics.f90
+++ b/src/numerics.f90
@@ -1,6 +1,7 @@
 !--------------------------------------------------------------------------------------------------
 !> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH
 !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
+!> @author Sharan Roongta, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief Managing of parameters related to numerics
 !--------------------------------------------------------------------------------------------------
 module numerics
@@ -64,16 +65,13 @@ subroutine numerics_init
   numerics_root => emptyDict
   inquire(file='numerics.yaml', exist=fexist)
   
-  fileExists: if (fexist) then
+  if (fexist) then
     write(6,'(a,/)') ' using values from config file'
     flush(6)
     numerics_input =  IO_read('numerics.yaml')
     numerics_inFlow = to_flow(numerics_input)
     numerics_root =>  parse_flow(numerics_inFlow,defaultVal=emptyDict)
-  else fileExists
-    write(6,'(a,/)') ' using standard values'
-    flush(6)
-  endif fileExists
+  endif
 
 !--------------------------------------------------------------------------------------------------
 ! openMP parameter