diff --git a/devtimer.py b/devtimer.py
index 29a4830..aae0864 100755
--- a/devtimer.py
+++ b/devtimer.py
@@ -105,10 +105,12 @@
 
         # Beep periodically
 
-        if elapsed_time and not elapsed_time%BEEP:
+        if not elapsed_time % BEEP:
             beep()
 
-        last = time()
+        if DEBUG:
+            last = time()
+
         update_thread = Thread(None, show_elapsed, None, (display0, elapsed_time))
         sleep(1.000 + ((NORMAL_TEMP-get_temp()) * compensate[0]) - CALIBRATION_OFFSET)
         elapsed_time += 1