diff --git a/src/read_controlling_parameters.f90 b/src/read_controlling_parameters.f90
index d8e8dec03911529f56257e3f2846dfe8f4ab7997..b2abde646b63daf2524377fd63c83c3d7e5675ed 100644
--- a/src/read_controlling_parameters.f90
+++ b/src/read_controlling_parameters.f90
@@ -74,7 +74,10 @@ case ('debug')
 
   ! Input values are now written to stdout or log files here
   if (params%debug.gt.0 .and. iproc.eq.0) then
-    write(*,'(a)')      shift//'Input debug level:'
+    write(*,'(a)')      shift//'--------------------------------------------------------------------------------'
+    write(*,'(a)')      shift//'--- INPUT FILE VALUES ---'
+    write(*,'(a)')      shift//'--------------------------------------------------------------------------------'
+    write(*,'(a)')      shift//'--- CONTROLLING PARAMETERS ---'
     write(*,'(a,i3)') shift//'debug',params%debug
   endif
 
@@ -112,23 +115,31 @@ case ('main')
 
   ! Input values are now written to stdout or log files here
   if (params%debug.gt.0 .and. iproc.eq.0) then
-    write(*,'(a)')    shift//'Input controlling parameters:'
+    write(*,'(a,l1)') shift//'doDoRuRe ',params%doDoRuRe
+    write(*,'(a)')    shift//'--- RESTART ---'
     write(*,'(a,l1)') shift//'irestart ',params%irestart
     write(*,'(a,a)')  shift//'restartfile ',trim(params%restartfile)
+    write(*,'(a)')    shift//'--- # OF SURFACES, MATERIALS, BOXES, SECTIONS ---'
     write(*,'(a,i3)') shift//'ns ',params%ns
     write(*,'(a,i3)') shift//'nmat ',params%nmat
     write(*,'(a,i3)') shift//'nboxes ',params%nboxes
     write(*,'(a,i3)') shift//'nsections ',params%nsections
-    write(*,'(a,l1)') shift//'doDoRuRe ',params%doDoRuRe
+
   endif
   if (params%debug.gt.1) then
+    write(threadinfo%Logunit,'(a)') '--------------------------------------------------------------------------------'
+    write(threadinfo%Logunit,'(a)') '--- INPUT FILE VALUES ---'
+    write(threadinfo%Logunit,'(a)') '--------------------------------------------------------------------------------'
+    write(threadinfo%Logunit,'(a)') '--- CONTROLLING PARAMETERS ---'
+    write(threadinfo%Logunit,'(a16,l1)') 'doDoRuRe ',params%doDoRuRe
+    write(threadinfo%Logunit,'(a)')      '--- RESTART ---'
     write(threadinfo%Logunit,'(a16,l1)') 'irestart ',params%irestart
     write(threadinfo%Logunit,'(a16,a)')  'restartfile ',trim(params%restartfile)
+    write(threadinfo%Logunit,'(a)')      '--- # OF SURFACES, MATERIALS, BOXES, SECTIONS ---'
     write(threadinfo%Logunit,'(a16,i3)') 'ns ',params%ns
     write(threadinfo%Logunit,'(a16,i3)') 'nmat ',params%nmat
     write(threadinfo%Logunit,'(a16,i3)') 'nboxes ',params%nboxes
     write(threadinfo%Logunit,'(a16,i3)') 'nsections ',params%nsections
-    write(threadinfo%Logunit,'(a16,l1)') 'doDoRuRe ',params%doDoRuRe
   endif
 
 end select