diff --git a/src/KOKKOS/verlet_kokkos.cpp b/src/KOKKOS/verlet_kokkos.cpp
index 0db6ca5b76..73e8790476 100644
--- a/src/KOKKOS/verlet_kokkos.cpp
+++ b/src/KOKKOS/verlet_kokkos.cpp
@@ -55,9 +55,9 @@ void VerletKokkos::setup()
 {
   if (comm->me == 0 && screen) {
     fprintf(screen,"Setting up Verlet run ...\n");
-    fprintf(screen,"  Unit style  : %s\n", update->unit_style);
-    fprintf(screen,"  Current step: " BIGINT_FORMAT "\n", update->ntimestep);
-    fprintf(screen,"  Time step   : %g\n", update->dt);
+    fprintf(screen,"  Unit style    : %s\n", update->unit_style);
+    fprintf(screen,"  Current step  : " BIGINT_FORMAT "\n", update->ntimestep);
+    fprintf(screen,"  Time step     : %g\n", update->dt);
     timer->print_timeout(screen);
   }
 
diff --git a/src/USER-CUDA/verlet_cuda.cpp b/src/USER-CUDA/verlet_cuda.cpp
index 2a2b536633..019093f806 100644
--- a/src/USER-CUDA/verlet_cuda.cpp
+++ b/src/USER-CUDA/verlet_cuda.cpp
@@ -120,20 +120,10 @@ void VerletCuda::setup()
 
   if (comm->me == 0 && screen) {
     fprintf(screen,"Setting up Verlet run ...\n");
-    fprintf(screen,"  Unit style  : %s\n", update->unit_style);
-    fprintf(screen,"  Current step: " BIGINT_FORMAT "\n", update->ntimestep);
-    fprintf(screen,"  Time step   : %g\n", update->dt);
-    if (update->max_wall > 0) {
-      char outtime[128];
-      double totalclock = update->max_wall;
-      int seconds = fmod(totalclock,60.0);
-      totalclock  = (totalclock - seconds) / 60.0;
-      int minutes = fmod(totalclock,60.0);
-      int hours = (totalclock - minutes) / 60.0;
-      sprintf(outtime,"  Max walltime: "
-              "%d:%02d:%02d\n", hours, minutes, seconds);
-      fputs(outtime,screen);
-    }
+    fprintf(screen,"  Unit style    : %s\n", update->unit_style);
+    fprintf(screen,"  Current step  : " BIGINT_FORMAT "\n", update->ntimestep);
+    fprintf(screen,"  Time step     : %g\n", update->dt);
+    timer->print_timeout(screen);
   }
 
   // setup domain, communication and neighboring
@@ -654,7 +644,6 @@ void VerletCuda::run(int n)
   cuda->downloadtime = 0;
   int firstreneigh = 1;
 
-  timer->init_timeout();
   for(int i = 0; i < n; i++) {
 
     if (timer->check_timeout(i)) {
diff --git a/src/USER-INTEL/verlet_intel.cpp b/src/USER-INTEL/verlet_intel.cpp
index d897ea36ec..b95f9b48b9 100644
--- a/src/USER-INTEL/verlet_intel.cpp
+++ b/src/USER-INTEL/verlet_intel.cpp
@@ -271,7 +271,6 @@ void VerletIntel::run(int n)
   if (atom->sortfreq > 0) sortflag = 1;
   else sortflag = 0;
 
-  timer->init_timeout();
   for (int i = 0; i < n; i++) {
 
     if (timer->check_timeout(i)) {
diff --git a/src/min.cpp b/src/min.cpp
index 0f188f2462..240751b48e 100644
--- a/src/min.cpp
+++ b/src/min.cpp
@@ -185,7 +185,8 @@ void Min::setup()
   if (comm->me == 0 && screen) {
     fprintf(screen,"Setting up %s style minimization ...\n",
             update->minimize_style);
-    fprintf(screen,"  Unit style: %s\n", update->unit_style);
+    fprintf(screen,"  Unit style    : %s\n", update->unit_style);
+    timer->print_timeout(screen);
   }
   update->setupflag = 1;
 
diff --git a/src/timer.cpp b/src/timer.cpp
index 39327bc256..2452d69673 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -237,7 +237,7 @@ void Timer::print_timeout(FILE *fp)
     s  = (s - seconds) / 60;
     const int minutes = s % 60;
     const int hours = (s - minutes) / 60;
-    fprintf(fp,"  Walltime left: %d:%02d:%02d.%02d\n",
+    fprintf(fp,"  Walltime left : %d:%02d:%02d.%02d\n",
             hours,minutes,seconds,hs);
   }
 }
diff --git a/src/verlet.cpp b/src/verlet.cpp
index 016a644bd0..60974ab6fe 100644
--- a/src/verlet.cpp
+++ b/src/verlet.cpp
@@ -89,9 +89,9 @@ void Verlet::setup()
 {
   if (comm->me == 0 && screen) {
     fprintf(screen,"Setting up Verlet run ...\n");
-    fprintf(screen,"  Unit style  : %s\n", update->unit_style);
-    fprintf(screen,"  Current step: " BIGINT_FORMAT "\n", update->ntimestep);
-    fprintf(screen,"  Time step   : %g\n", update->dt);
+    fprintf(screen,"  Unit style    : %s\n", update->unit_style);
+    fprintf(screen,"  Current step  : " BIGINT_FORMAT "\n", update->ntimestep);
+    fprintf(screen,"  Time step     : %g\n", update->dt);
     timer->print_timeout(screen);
   }